bitkeeper revision 1.1159.212.5 (41dd8c833VN1DSNo5vb1QUlsjz5GyA)
authorcl349@arcadians.cl.cam.ac.uk <cl349@arcadians.cl.cam.ac.uk>
Thu, 6 Jan 2005 19:07:47 +0000 (19:07 +0000)
committercl349@arcadians.cl.cam.ac.uk <cl349@arcadians.cl.cam.ac.uk>
Thu, 6 Jan 2005 19:07:47 +0000 (19:07 +0000)
Merge arcadians.cl.cam.ac.uk:/auto/groups/xeno/users/cl349/BK/xen-unstable.bk
into arcadians.cl.cam.ac.uk:/local/scratch-2/cl349/xen-unstable.bk-tmp


Trivial merge